Auto merge of #2297 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 25 Jan 2016 17:34:19 +0000 (17:34 +0000)
committerbors <bors@rust-lang.org>
Mon, 25 Jan 2016 17:34:19 +0000 (17:34 +0000)
commit44c0d7b78548c83b6df4935fdbb15be62f30d685
treea75a3964ea6b36261aced7f31b0b43ebdcac0587
parentf052d9953f23f55534f497cc70b2b106beefb988
parentdd34296008c6b1bf6cc1411d92c55d80ebd5c690
Auto merge of #2297 - alexcrichton:update, r=alexcrichton

Just a routine for niche bug fixes, linkage errors, perf improvements, etc.

Closes #2295
Cargo.lock
Cargo.toml
src/bin/cargo.rs
tests/tests.rs